Added functions implementation