Fixed builder pattern (adding constructor)