Cleaned up builders with AbstractEntityBuilder.