First pass for adding metadata + annotations