Changed flattener rules