Add check
Improvements