Consolidated api headers and add sf_opt