Pre-CoreData safety commit