Various Updates for resource keys