Add support for boolean vars