Last pull changes
Removed customer hardcoded entity.