Add unpacker generator and so on