Handle primary responsibility correctly in the frontend