Refactoring because we changed the purpose of the package