ArrayMap completely replaced with Collection