Update controller annotation to the current state of the art