* Various Helper Module changes