Elequent model gerefacterd