DB structure and more improvs