updated support to sdk 0.5.21