Improve override usability