Added scoping and app actions