Updated to follow storage guidelines