Merged prop.type function back into db class. Also Fixes #4