Switch from Struct to ActiveModel