Updated Client engine