added join and restricted resource handeling