Add Parser and Terms