Storage function fully implemented