Added additional smart auto-complete UDFs