Clarified responsibilities