Type checking added.