Updated Resource handling - centralized