Rsponsabilities refactor