Fixing missing support for constants.
Adding annotations XML validation support.