Without project-stub and small refactoring