Added better extension