Removed config and added logic
Todo test without config on a new project