WIP: adding 0.4.0 support