Add output functions + feed aggregation for Atom

And remove this also.