Thiru | #12 | Refactored the database classes