Additional database script changes