Added HWP and HWR to the project