Added comparisons
Removed CallableContainer and moved the static map to Callable for the
future move to signature evaluation