Improved code in schemas and users routes