Changes for pimatic 0.8.x