More updates to code parsing