Used service call instead of hardcoded data