Major updates to bookingflow