Adding more completeparser changes