Add assertions
Refactoring