Applying patches from main baltimore code repo.
Data update
Patch parser to delete structures