Fleshing out custom identifier handling