Add extra fields and markdown support