Add some validation, update format config