Refactored extended resource objects for better resue