Updated entities and endpoints

Please confirm.