Add first draft name parsing