Changed API to class library