Update to 0.6.4 - Optimize Code