more database, message class added