Extension handling