updated database definitions with cascades