Changes for new bottle object