Reduce number of queries by making User a service