Updated client for parsing