features: updated for 0.10