Changes for change to public plans.
id -> username