Make version an enum -- must be '1'
Layer may match either single or composite layer def.