Use indexes instead of hardcoded properties