Added support to the code generator for packages