Added more support methods for selection, made parameters const where possible. Changed XIF interfaces