Added Database interaction (untested)