Added custom resource support