Initial checkin of the unsupported API