All new changes will go into 0.4 release