Started passing system objects along to helpers.