Changes for Beanstalk