Added some id process logic