Changes for beanstalk