Adding defer interface to play nice with when and q