Maded the template system even smaller