Added missing tags for doc generation