Changed name of database class
Added new types
Project file