Changed the nin validator to accept more nin formats
Refactorized one nin storage format