Improve library: booking feature. See #47