Update comments for  singleton class
add builder pattern