Parser changes & create.sql