Cleanup from previous refactoring
Added supported selectors documentation