Added support for additional code generators