Add id validation