Make contains stronger and use Decimal only