Refactored Template and Meta Data