Removed builder pattern all together