Add Models, fix login issues