Added database builder