Added database components