Added functionality.

Domain and Baseline can now be defined as string AND array.