b4 create diagram
refine db & controllers