Added interfaces for types
Reworking map iteration
Remove reset