fixed bug and added intent data support