Fix API compatibility 0.19, work on storage ongoing