Added custom extension element support
merged with master