Added boto
Better handling of settings