Better handling of related subresources