Changed Cell array to a Map