Removed dependency on hr_api