Refactoring. Added systemstorages