Further abstracts templates

From @ericecook