Added store and wif modules