Upcoming changes in v0.4 ( part 2 )