Initial support for Kind 2