Successfully integrated database options into master branch