Beanstalk improvements