Updated entities and facade