Add default implementation
Add compliance test