Get updated user schema and refactor