Fixed issue: Some method definition fix, PHPdoc