Add database class, additions for multi install.