I have ADT and it is working well. However, due to the masonry and steel in the construct of my home it is difficult to add Z Wave devices. Particularly the requirement to take light switches, and “install them” to get them recognized by the Z Wave device furnished by ADT. I need a more robust smart Hub, but one that will connect and be controlled through the ADT app/. Please advise, thanks