+ added improved api identifier support