Fix intent generation
Binding for Services