Added full STORE support