Added functions, classes, inheritance