Fix clearing in core parser
Update DB schema