Added lib functions to class