Added support for JWP