Use computed properties instead of weird helpers that cause some issues