Handling more complicated mapping scenarios
Fixed a bug where we don't map even when a selector exists on an object