Added amplitude envelopes' support