Amir: Modified class name