Fixed Index error, made Maps mutable