Feature/entities/disk