Modify to allow app nodes