Updated class to reflect guideliens for CTH