Changed Array to Dictionary