added support for some more expressions