Added option to add a water box