improve auto identifiers generation