DBC Refactor