Small Changes to most Database related classes