Modifications due to deprecation of builders in jdk8 b91