More re-arranging for id scheme