Updates to work with 0.10