Adding more control on listeners with commands
Fix deployment