Updated DB Attributes and corresponding objects to match