Update to original simulator interface and added exp. design simulator