Expanding file structure and SQL definitions.