Rebuild and add Extensions