Updated for separation of simulation and reconstruction classes