[WIP] Improve: Ignore empty objects