Mads Client v2 re-architecured