Updated PHPDoc and return values