Can you make this `MediaCore` throughout this PR?