Refactor ApplicationDataSource > ApplicationDB