Added new Graphics and adapted methods to work with the new DB