Support for 0.10