adding support for vectors, matrices etc