add Extensions handling