Added all the classes from the local version