Refactored methods which don't use selector filters