Added HWP and HWR classes.