Move towards template support and using methods