Added _now suffix to active and inactive, added active_at and inactive_at