Added support for courses databases