Updated version to include changes to entity