Added ID checking