Working on type checking