Add using, union and option match clauses