[BUGFIX] Corrected phpdoc tags and class usage