add Builder Patter
fix namespace