Add support for boolean bundle