Modernize Objective-C and Improve the client subclass
Ignore two properties in the API, they aren't needed here.