Minor fixes
Extracted independent component for model/storage