Added vendor extension support