Refactor id column