Resolving deprecation issues