Completed type checking