Preparing for SQL integration