Add parser to basic resource
Clean up unused imports