PHPDoc and instantiation updates