Added State formatter