Adding 3rd party extensions support