Manage kickstand resource relationships correctly