Most states to enrol under revamped electricity distribution