Use new methods
Rename to support new project structure