fix - builder return type
fix - factory return type