Upgraded version (0.2.0-SNAPSHOT)