Add optinal properties and wiki page generation