Major Functionality/ DB Enhancements