Updated code for support class functionality