failsafe implementation done and integration as well
changes in storage layer variation (now it should be given in the options)