Updated copyrights
Simplified usage of template choice