Slightly enhanced version of the PSR2 standard