Added rating feature + business logic changes