InspectorMacro refactor - preparing support for Array