Add enum declaration + template parame def list