Bring back support for empty objects