Better implementation of default extensions