Move towards more basic extension