Some changes for using Identity from Data layer