MAL-59 | Change class