initial support for early defs