Changed config to not be hardcoded