Updated FWAS API