WIP: Correctly persist identifiers and their types [skip-ci]