[Faris] : Refactored model.