API fixes: CN resources defined as optional members