+Handling parsers in a database-Map
refactoring