Move version to 1.3.1.qualifier
Better builder wrapper