Add attr protected
Cleanup