Added iterator utilities and changed some things

Signed-off-by: Ravn T-M <ravn.tm@gmail.com>