updated storage handling and fixed bug in roadmap