Refactoring to the database schema parser