class: Modified files for new implementation