Adding 0.10.1 features