UC005 database refactoring some new class
Fixed merge issue, but there is still a UI issue