Fix intent integration