Improve with Auto guard and Helper Module