#48 - Refactored template