Fixed: sync phpdoc and interface with refactoring