Added Parser and Builder types