Version 0.6 updates