Could you update it to that and add a few test cases to `./tests/` to cover the variations of id’s?