Statements were extracted to a separete handler