Removed usage of BuilderApi Interface, for now