reduce size of context, fix double support in template