Some changes for converter