Added function call tracking