adds poke/peek support