Enhance implementation