Add decode support