Updated schema to reflect recent changes to security