Fixed issue with wrapping data readers within using statements. Updated database scripts.