updated parsing functionality of class argument