object collection is now map
refactor