Updated base SQL scripts