Separate ModelDataSource into 2 files for clarity