+ added detection for FlatDatabase usage