Extended with code request function