Database class and Parser class modified