Added support for booklets