Removing coupling to User model