Feature/deprecation time