However, if you want to stick to the method you currently already:
Admittedly, this will be a short lived solution once things get more complicated and a major source of banging one’s head against the wall. On the other hand, it you keep things really simple, it might be fine if a wee bit tedious to maintain.