Fixed builder (added Init)