FIX: re-added user to models