Intellidemand and intelliactive(squashed)

Some changes for intellidemand

Intellidemand and intelliactive