Add some feature to terminal version