Add parse mechanism