added eager loading on activities