PSR Logger & Improvements