Working on 0.4.3 support