Moved non-persistent classes bodies above the "persistent classes" comment :)
Switched if_else with two identical args to more logical "classes=>always"