Extensions to include only added, better error resolve strategy
 functionality add

extensions only to include functionality added
Better strategy to prevent error