Getting rid of Builder