Updated to 0.6.5-SNAPSHOT