Point to right end point, make resources more DRY