Closes #1: Waiting longer for data to be available via ECS