Added isEnabled