Added proper event source declarations and removed CMM and static on all memory for easier debug