Updated to handle the new SQL files