Modified to be able to add multiple app handler listener