Add users and refactor resources
Fix searching and pagination