Added ability to pass references in maps