Added more code-generation