Adding ability to retry jobs, and going PSR compliant