Continuing to upgrade Models to Rails4 version