Changes to fit own configs