Removed Entity/User, updated AbstractUser instead.