Removing throws and adding Collections using