Re-added make_object to entities.entity imports since it was erroneously removed in the last commit d31b762.