Moved to portable client library