Converted to class library