Change default ordering
Add commit message to states