Extract info stuff
Refactor id handling