Support Encore

Change-Id: I4a15b615b0f4213bd0b897273baf9cc2e061ef5d