Added templates + static