Enhance custom control