Update to remove deprecated statements and latest changes