Updates to work better with current client