Updated booking wizard and booking model