fixed wrappers to work without transaction context