added support for lists and so on