Add more feature in code generator.