Fix #549: Allow apps and groups