STAN - raw support restored