Update javadocs and add methods to Selector