Hi Ludovic, Sorry about going ahead with refactoring instead of test cases but i thought it would be easier to write tests once the code is refactored. I've completed most of the refactoring but it will take about 2 more days to finish it off. Please have a look at the new code base if you have a time [ i know you are busy :) ] and let me know what you think. I hope following deadlines (swapped refactoring and test case writing) are ok with you, 21st - Finish Refactoring 28th - Finish Test Case Writing ... Rest is same Thanks a lot. - Asiri