Refactor config and add existing data