added extensions support