Updated to work with pimatic 0.8