Added predicated for number minimum/maximum values.
Refactoring.