Update for 0.13, removing (.) operator