Added Database support classes