Adds parameter
Moves Builder related interfaces to separate namespace
Fixes builder
Fixes coverage