Added cd support