Started to add support for boolean type