Added initial support for simulated data