Updated docs and simplified builder API