added more terminal types