Refactored TrackContorller and DAO