@pservedio Can you see this being used elsewhere and thus possibly putting this in a different class?