Revert back to loose implementation of mappings

Will implement alternate approach on a separate branch