Minor changes in builder pattern for instances construction