Added support for strings and bools