Device utils changes