Improved and extended the handling for Extensions