Replaced few implicits