Added additional init classes