twip: pull push_entities into the class