Add isEnabled and filter