[Changed] Refactored Template a little.