-Updated controllers and added UserQueries