DO NOT MERGE: Fixing Entities

For some reason, I couldn't get the _call_client_post work, using my old base.requests ...