Added collectionName and urlName to Entity annotation