Added Hikari Support