More updates to parser