More fine-grained tracking and support DB as storage