Started added type checking.