Storage implementation skeleton fixed