Add support for public function