Feature/entities/disk

Absolutely, optionals are set to nil by default. I'll change it