UPD: #1225 for QueueModule + small PSR and somes fixes