Refactoring of parser
Updated database