Add secondary functions. Add context to selectors