Feature/boolean support