started adding plugin support