Hack in additional data in the non-controller case