Simplify id mechanism