Extended wrapper to include stats, clean up existing modules
Extended wrapper to include stats, clean up existing modules