Moved callback to own module