Old arrays replaced with Maps