Add option to enable deprecated