Enhance deprecated warnings
Add missing DEPRECATED_FOR