Fixed dependencies
namespaces added, resolved dependencies