Added Intent mapping