(COMMIT-16) Resource handler