Started conversion of convert functions to follow Markup API