Added check for empty arrays which don't define new mapping.
Added fix for object mapping without any properties.