UPDATE: storage functions and initial support