Added database-features