Removed raw string
Entity.PK implemented