Added metadata tags. Refactored code in POCPlayer tool.