Add convert logic after parser