Database: Fix - Structure In Reference To The New Saftey Standard