added model and object databases, minor changes to other classes