Added dynamic checks