Move meta structure back to util
Pass metadata through to drawing functions