Misc preparations for REGACK & plugin's for storage option