6L38 compatibility update
-- removed the usage of 'storage' which is a reserved word and illegal to use in 6L38