Added helper classes and prefixed everything "cd"