More updates to make custom id types work