Change implementation to Dictionary from List