adding the data source interceptor, and better settings module