Version to 1.9.4-SNAPSHOT
Significantly reduce code duplication