Updated templates to allow containers to contain more than one part
Generated source code