Simplify logic in waas