Added support for InPAWS