Include config object
format refactoring