Enhance functionality