Support all embedded definitions