Added functions and classes