Fixes merge issue , fixes the ServiceContext lazy fields to be the underlying interfaces, adds public ctor