Updated function defines