Added basic template system