Adding Terminal v2.4 (326) support