Added delegate forwarding support