Form 8 Refactoring to comply the xml based logic.