restructure embedAnnotation more
support for pre-built interfaces