Pet class improvements