Changes to support alternative types of input for object mapping