Update and fix Intent API