Updates for code generation and module initialization