Switched to a standard class library