Updated to support latest version