Added support for user defined extra values
PHPDoc