PSR compliancy