Namespace, change imports
Resolve deprecations