Added jersey support