Add deprecation guards