Added custom ID handling