Add initial thor support

Change-Id: I16fb00029e3e0d640c7d283a8d72c90132ea7e68