Upgrade version to 0.8.4-SNAPSHOT and remove some of tedious boiler plate code