Now allowing Decimal plans (fix #28) and also work towards #10