Done: refactoring _id