Added more support for primtives.