Update for QNAP support