Fix: Add more trailing commas