Started refactoring infiniteArrayDataSource