Corrected database methods.
Merge remote-tracking branch 'Origin/Iteration2' into Iteration2