Updated for elastic beanstalk