Added support for Term and Shell(?)