Added sandbox, WAConstants. Updated WAParser