Added edit hardware support