moved more checkings into transformers classes