Add some stuff for AWS tools and such