added collection classes and database