Updated for third party helpers