Instead of classes added functions