Added Terminals, and encapsuled MAC concepts