[IMP] Improved and added functionality of Hr and Hr related modules