Refactored Database mappings into their own files, using the reader directly
Refactored helper methods on reader to simplify retrieval from name insatead of column index