Made api more builderish