Updated PHPDoc/annotations