Refactored User and Quest models