Added hproduct backcompat mapping, basic test