Use computed properties instead of manually checking equality