Improved Entities.