Added support for top-level primitives