Thanks for the advice. I’ve made the adjustments that you proposed. Still have to write a test case for this to finish the ticket. I hope I can finish it tomorrow.