Small index fix
Changed model attributes and removed deprecated method