Minor fixes.
Added annotator to annotate classes with defaul contracts.