AbstractEntityController changed to EntityController