Update sample codes + resolve service mismatch