Added true/false support