Refactoring to support PostConditions