Added function pointer handling.