Added Serenity coverage, we'll see how this looks of course!