Simplify initialization
Release 0.6.4