Add isEnabled checks