Added JA Support