Added known exceptions for entities