Improved: StatementFormater infrastructure - POC