Adding more maps and starting to improve Securitygroups