Updated function paths