Migrated to client side library