A little better content broker struct (still shitload of work)