added isEnabled flag