Changed manage to work properly on dev machines