Some more changes to Storage and Monthly modules