Updated DB model with tables relationships