changed method signature (set Map instead of List as return value)