More updates to CTD parser