Enhanced definitions