Adding support for lists, hashes and strings