Updated to work with helper