Fixed property name and missing properties added (fixes #674)
Missing xml mapping in DatabaseRequirement (fixes #676)