Added initial extensions support