Added delayed job support