Improve template customization & Add test