Added booking to converter.
Merge remote-tracking branch 'origin/impl2' into impl2