Modifications due to deprecation of Builders in JDK8 b91