Refactor identifier and dropdown fields