Added string and boolean support (work in progress).