Changes to include building with prepared statements