Implement enhancement features