Added 0.8.3 features