Refactor DataSource#to_x methods