Added Waterville (Synthetic Data) support. Not tested!!