Rework statements.json