Updates to Services Entities to help fix updating issue