Moving Parser dependency to caql.