Doc and interface modified