Spike on improving deprecation management