Thank you, it sounds pretty good, especially solving the modules problem. I will look into it when finished current sprint.