Add support for disabled state and update.

No milestone No one is assigned
Merge code from cristiandreica (disabled-enable functions) 
Merge code from riker09 as it is (update function).
Fix disable-enable system.