modified models in goals, seperated to auth app