Fix #549: Allow apps and groups 

Fix for #549