Improved advice implementation