Using this approach (in case it helps anyone with the same issue)