Added methods from Pi edition api to coresponding interfaces and a
little shuffling around.