Simplify client indicator module
Add remote client arming