Updates for parsing and ports