Added a few simple tags for POC