added type in the <> to the arraylists/hashmaps