Merge "Implement builder"