Add support for override annotations