Lot of improvements, markdown, sub-schema for properties