Make the API more extensible
v1.5.0