Added Instance duplication, small template cleanups