Added callback handling as inline return