More cleanup - moving result attributes into core.