* Added when(...).when(...)
* Corrected entry verifications on then()