Changed Arraylists to Hashmaps