I'm not sure what the best solution would be so lets just stick with a solution (yours) for now and then we can go back and revisit when we need to do this again.