Add context in generation of polymorphic variants (specially for atom:entry)
RFC Compliant for entry (and contextualization of entry)