Add missing  covers annotation
Remove duplicate mapping
Add required options.