Added deprecation feature