Move client to the top to prevent breaking existing implementation