Add Steven Hickson's callback with image support