Added the ability to overwrite 'override' completion