Improvement at Id struct