Added support for mapping by id
Lookups now supports user objects