Annotated classes
Builder class now static