Changed to fit newer helper component "API"