Added boolean / checkbox support