Added changes for deprecation notice