Added config and fixed njsproj after merge