Adding builders and interfaces