Extracted UID creation to own class