Refactor: Availability,Company,ClientGroup,User