Fixing simulation framework to use the new API