Update to activemodel