And some deprecation