Updated extra utilities