CFY-1433 comment some
CFY-1433 stop using depends,contained,connected enum and start using type hierarchy