Added basic support for compound types