Add field - Fix #34 -- Empty object count as a primitive -- Fix ordering in case of empty objects