Widget Module Refactor changes