--HR-282 Change function method to static function