Refactored resource definitions