Improved function analysis