Added 0.3 changes