Added skeletons for storage & context