Added internal storage interactions