db Design changes