Change the @unimplemented behavior a bit