ICM-17 : Made persistance part more pluggable
ICM-17 & ICM-20: Made persistance part more pluggable