Add isExposed check