Database Classes en Comment Classes added