ID support improvements